diff options
| author | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2012-05-11 15:35:56 +1000 |
|---|---|---|
| committer | Wolfgang Beck <wolfgang.beck@nokia.com> | 2012-05-14 01:42:24 +0200 |
| commit | 5cfafb789f401ed7289ff38804aded5a40b4156a (patch) | |
| tree | b40815d6e20d4ac668b33d1ceba8a52e55763677 | |
| parent | b9fac4fa970d06a1145048bdf271853e5d4f88d4 (diff) | |
QT_BUILD_INTERNAL and Q_AUTOTEST_EXPORT are evil
These prevent normal builds from running and being tested.
Just get rid of them.
Change-Id: I416f3c4368a270a8a8fcf4d7acf1491860438cb7
Reviewed-by: Wolfgang Beck <wolfgang.beck@nokia.com>
| -rw-r--r-- | src/logger/qlogger.cpp | 2 | ||||
| -rw-r--r-- | src/logger/qlogger_p.h | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/logger/qlogger.cpp b/src/logger/qlogger.cpp index d2d868e..d20173d 100644 --- a/src/logger/qlogger.cpp +++ b/src/logger/qlogger.cpp @@ -538,9 +538,7 @@ void QLoggingPrivate::readSettings(QIODevice &device) gEnabled = true; } -#ifdef QT_BUILD_INTERNAL emit configurationChanged(); -#endif } /*! diff --git a/src/logger/qlogger_p.h b/src/logger/qlogger_p.h index 17ffd7f..3d5ce59 100644 --- a/src/logger/qlogger_p.h +++ b/src/logger/qlogger_p.h @@ -87,10 +87,8 @@ public: void readSettings(QIODevice &device); void updateCategory(QLoggingCategory *log); -#ifdef QT_BUILD_INTERNAL Q_SIGNALS: void configurationChanged(); -#endif public slots: void fileChanged(const QString &path); @@ -123,7 +121,7 @@ public: QLoggingCategoryDefault(); }; -Q_AUTOTEST_EXPORT QLoggingPrivate *qtLoggerInstance(); +Q_LOGGER_EXPORT QLoggingPrivate *qtLoggerInstance(); QT_END_HEADER |